From: Philip Withnall <withnall@endlessm.com>
Date: Tue, 22 May 2018 11:13:08 +0000 (+0100)
Subject: lib/repo-pull: Use values from struct in enqueue_one_object_request()
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~197^2~1^2~32
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8593357902ef3695b4eb9996e0567a07e3dcd006;p=ostree.git

lib/repo-pull: Use values from struct in enqueue_one_object_request()

This introduces no functional changes, but will make some upcoming
refactoring a little easier.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #1599
Approved by: jlebon
---

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index f5745f86..4410f998 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -1939,12 +1939,11 @@ enqueue_one_object_request (OtPullData                *pull_data,
     {
       g_debug ("queuing fetch of %s.%s%s", checksum,
                ostree_object_type_to_string (objtype),
-               is_detached_meta ? " (detached)" : "");
+               fetch_data->is_detached_meta ? " (detached)" : "");
 
       if (is_meta)
         {
-          GVariant *objname = ostree_object_name_serialize (checksum, objtype);
-          g_hash_table_insert (pull_data->pending_fetch_metadata, objname, fetch_data);
+          g_hash_table_insert (pull_data->pending_fetch_metadata, g_variant_ref (fetch_data->object), fetch_data);
         }
       else
         {